Naive replacement of FromError

diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs
index f277cd6a09b3e7c77e15ee0d287ca93d68d90172..eb83228aa1e8aeef10a21056d34f7f905a7afe52 100644 (file)
--- a/src/cargo/lib.rs
+++ b/src/cargo/lib.rs
@@ -27,6 +27,7 @@ extern crate url;
 extern crate registry;
 
 use std::os;
+use std::error;
 use std::io::stdio::{stdout_raw, stderr_raw};
 use std::io::{mod, stdout, stderr};
 use rustc_serialize::{Decoder, Encoder, Decodable, Encodable};
@@ -58,7 +59,7 @@ mod cargo {
 #[macro_export]
 macro_rules! try {
     ($expr:expr) => ({
-        use cargo::util::FromError;
+        use std::error::FromError;
         match $expr.map_err(FromError::from_error) {
             Ok(val) => val,
             Err(err) => return Err(err)

diff --git a/src/cargo/ops/cargo_read_manifest.rs b/src/cargo/ops/cargo_read_manifest.rs
index 5d3a6f32d8cd20b5d0ee495727aa03540bdbe8bf..9e78c4f9d1d965de26b03494f6319b8cfdaffab1 100644 (file)
--- a/src/cargo/ops/cargo_read_manifest.rs
+++ b/src/cargo/ops/cargo_read_manifest.rs
@@ -3,9 +3,10 @@ use std::io::{mod, File, fs};
 use std::io::fs::PathExtensions;
 
 use core::{Package,Manifest,SourceId};
-use util::{mod, CargoResult, human, FromError};
+use util::{mod, CargoResult, human};
 use util::important_paths::find_project_manifest_exact;
 use util::toml::{Layout, project_layout};
+use std::error::FromError;
 
 pub fn read_manifest(contents: &[u8], layout: Layout, source_id: &SourceId)
     -> CargoResult<(Manifest, Vec<Path>)> {

diff --git a/src/cargo/util/errors.rs b/src/cargo/util/errors.rs
index 7dedfa953565bd142dbd58d6088ae7d854d2df15..2d4ccdf75cd5f539894b72bb6951db85b27a0bab 100644 (file)
--- a/src/cargo/util/errors.rs
+++ b/src/cargo/util/errors.rs
@@ -4,6 +4,7 @@ use std::fmt::{mod, Show, Formatter};
 use std::str;
 use rustc_serialize::json;
 use semver;
+use std::error::FromError;
 
 use curl;
 use docopt;
@@ -27,10 +28,6 @@ pub trait CargoError: Send {
     }
 }
 
-pub trait FromError<E> {
-    fn from_error(error: E) -> Self;
-}
-
 impl<E: CargoError> FromError<E> for Box<CargoError> {
     fn from_error(error: E) -> Box<CargoError> {
         box error as Box<CargoError>

diff --git a/src/cargo/util/mod.rs b/src/cargo/util/mod.rs
index 1ce80b094e10a1b90313313242d305141b53d402..f03a8ed2dae70a0c5945a12e2100eca1595caaec 100644 (file)
--- a/src/cargo/util/mod.rs
+++ b/src/cargo/util/mod.rs
@@ -2,7 +2,7 @@ pub use self::config::Config;
 pub use self::process_builder::{process, ProcessBuilder};
 pub use self::result::{Wrap, Require};
 pub use self::errors::{CargoResult, CargoError, BoxError, ChainError, CliResult};
-pub use self::errors::{CliError, FromError, ProcessError};
+pub use self::errors::{CliError, ProcessError};
 pub use self::errors::{process_error, internal_error, internal, human, caused_human};
 pub use self::paths::{realpath, join_paths};
 pub use self::lev_distance::{lev_distance};